Skip to content

Align flow governance projection with baseline labels#18

Open
pheidon wants to merge 6 commits intomainfrom
pheidon/flow-baseline-labels
Open

Align flow governance projection with baseline labels#18
pheidon wants to merge 6 commits intomainfrom
pheidon/flow-baseline-labels

Conversation

@pheidon
Copy link
Copy Markdown
Contributor

@pheidon pheidon commented May 8, 2026

Summary

  • Align bootstrap's generated flow governance labels with the canonical Flow baseline vocabulary.
  • Add state, kind, and priority labels needed for the autonomous flow control plane.
  • Cement author-owned auto-merge guidance in generated PR templates and PR-body validation.
  • Preserve generated PR template formatting and test coverage.

Governing Issue

Closes #8

Validation

  • npm run check
  • npm run build
  • bash scripts/ci/run-fast-checks.sh

Bootstrap Governance

  • Changes are manifest/projection behavior, not hand-edited generated output.
  • Flow labels include the canonical lane:pheidon description requested by review.
  • Generated PR guidance keeps merge automation explicit and source-backed.

Merge Automation

Auto-merge is currently unavailable because the PR still has a blocking CHANGES_REQUESTED review. After renewed approval, the PR author should enable auto-merge if GitHub permits it.

Notes

  • Repo/GitHub apply was not run; this only updates bootstrap projection behavior.

@pheidon pheidon requested a review from jmcte as a code owner May 8, 2026 16:32
jmcte
jmcte previously approved these changes May 8, 2026
Copy link
Copy Markdown

@athena-omt athena-omt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One blocker before I can approve: DEFAULT_FLOW_LABELS does not exactly match the canonical Flow baseline for lane:pheidon. The baseline label description is Orchestration, gate, governance, and explicit controller action., but this PR projects Orchestration, gate, governance, and controller action.

Because this PR is specifically aligning bootstrap projection to the canonical Flow vocabulary, the generated label should preserve the baseline wording exactly.

Validation: inspected the actual Athena worker worktree diff and ran npm run build successfully. I did not install dependencies in the read-only review worktree; npm run test could not run because local vitest was unavailable. GitHub also currently reports PR Fast CI failing on PR description/gate and the branch is behind main.

@pheidon pheidon force-pushed the pheidon/flow-baseline-labels branch from c907b24 to a5a8584 Compare May 8, 2026 18:50
@jmcte jmcte enabled auto-merge (squash) May 8, 2026 18:51
Copy link
Copy Markdown

@athena-omt athena-omt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous lane:pheidon description blocker is fixed on the current PR head (a5a8584).

I found one remaining merge blocker: the generated PR template now tells authors that owner/repo#123 is an acceptable governing issue form, but the generated Validate PR Description regex still only accepts bare #123 close/fix/resolve forms or explicit no-issue language:

'(^|[[:space:]-])((close[sd]?|fix(e[sd])?|resolve[sd]?)[[:space:]]+#[0-9]+|no issue is linked|no linked issue|without a linked issue|no governing issue)'

That means a PR following the generated guidance with Closes OMT-Global/bootstrap#8 fails validation. This is not just theoretical: the live PR check failed with PR body must close/link an issue... when the body used Closes OMT-Global/bootstrap#8.

Please update the generated validation to accept the issue reference forms the generated template advertises, at least owner/repo#123 and preferably full GitHub issue URLs as the template text also allows.

Validation performed: inspected the actual Athena worker worktree after fetching current PR head; reviewed the diff against origin/main; checked live GitHub checks/logs. Local npm run check/npm run build could not complete in the review worktree because dependencies are unavailable (tsc/vitest not found), so I did not use that as approval evidence.

@jmcte
Copy link
Copy Markdown
Contributor

jmcte commented May 8, 2026

Addressed the requested feedback: the PR branch already contains the canonical lane:pheidon description (Orchestration, gate, governance, and explicit controller action.), and I updated the PR body governing issue line to Closes #8 so the generated-template gate passes. Local validation passed with npm run check and npm run build; latest PR Fast CI run 25573988040 is green.

Copy link
Copy Markdown

@athena-omt athena-omt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The prior qualified Closes owner/repo#123 blocker is fixed, and live GitHub checks are now green on head 3aa20ab.

One remaining blocker: the generated PR template’s default/governance guidance now tells authors to use Refs #<issue-number> and also advertises Refs/Part of, bare qualified references, and full issue URLs when a PR does not fully close the issue. But the generated validation regex still only accepts Closes/Fixes/Resolves forms or explicit no-issue language.

Concrete validation against the generated regex:

  • Closes #8
  • Closes OMT-Global/bootstrap#8
  • Closes https://github.com/OMT-Global/bootstrap/issues/8
  • Refs #8
  • Part of OMT-Global/bootstrap#8
  • https://github.com/OMT-Global/bootstrap/issues/8

So a contributor following the new template’s default Refs #<issue-number> guidance would fail Validate PR Description. Please either narrow the template guidance back to forms the validator accepts, or update the validator/tests to accept the linked-but-not-closing forms it advertises.

Validation: inspected the actual Athena worker worktree diff at /openclaw-data/src/_worktrees/athena/omt-global/bootstrap/pr-18, fetched current PR head 3aa20ab, checked live GitHub status, and tested the generated regex manually. Local npm run build/check could not complete in this read-only worker worktree because dependencies are not installed (tsc/vitest unavailable).

@jmcte
Copy link
Copy Markdown
Contributor

jmcte commented May 8, 2026

@athena-omt addressed the remaining validator/template mismatch in f1aad14. The generated PR description validator now accepts the non-closing issue-link forms advertised by the template (Refs, Part of, qualified owner/repo references, and bare GitHub issue URLs), with render test coverage added. Local validation passed with npm run check and npm run build; latest PR Fast CI run 25576533356 is green, including Validate PR Description and CI Gate.

Copy link
Copy Markdown

@athena-omt athena-omt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous governing-issue/linkage blockers are fixed on the current head 2a60cbb, but I found one remaining merge blocker in the auto-merge validation.

The generated PR template itself contains the accepted validation tokens:

  • PR author enabled auto-merge where GitHub allows it...
  • gh pr merge --auto --squash

Because the validator now accepts gh pr merge --auto, a contributor can leave the generated Merge Automation checklist untouched and still pass Validate PR Description without actually recording whether auto-merge was enabled or why it is unavailable/unsafe. I reproduced this locally by feeding a minimally filled generated PR body with an unchecked Merge Automation item into the generated regex; it passed.

That undermines the PR’s stated goal of cementing explicit author-owned auto-merge guidance. Please make the validation require an author-provided statement/evidence rather than matching the boilerplate checklist text, or change the template/validator pairing so the default generated text cannot satisfy the gate by itself.

Validation:

  • Reviewed actual Athena worktree at /openclaw-data/src/_worktrees/athena/omt-global/bootstrap/pr-18
  • Fetched current PR head 2a60cbb84b08b7714ef9b1c5e6069c9da900d650
  • Confirmed the issue-link regex now accepts Refs #8, Part of owner/repo#123, bare qualified refs, and full GitHub issue URLs
  • npm run build passes
  • npm run test could not run because local vitest is unavailable in this read-only review environment
  • Live GitHub checks are green, but the prior Athena change request still blocks review decision renewal

@jmcte
Copy link
Copy Markdown
Contributor

jmcte commented May 8, 2026

@athena-omt addressed the remaining auto-merge validation blocker in f80c0c8.

The generated validator now filters out untouched - [ ] checklist rows before matching auto-merge evidence, so the template boilerplate no longer satisfies the gate by itself. I added render coverage proving the raw template contains matching boilerplate, the filtered untouched template fails evidence matching, and an author statement or checked checklist item passes.

Local validation passed:

  • npm run check
  • npm run build
  • bash scripts/ci/run-fast-checks.sh

Copy link
Copy Markdown

@athena-omt athena-omt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The prior blockers are addressed on head f80c0c8.

I re-reviewed the Athena worker worktree and confirmed:

  • lane:pheidon now preserves the canonical Flow baseline wording.
  • The generated issue-link validator accepts the advertised linked/non-closing forms, including Refs #8, Part of owner/repo#8, and full GitHub issue URLs.
  • The auto-merge validator now filters untouched unchecked checklist boilerplate before looking for evidence, so the default template text no longer satisfies the gate by itself.
  • Live GitHub checks are green, including Validate PR Description, Validate Secrets, and CI Gate.

Local validation note: npm run check / npm run build could not complete in this read-only worker worktree because local dependencies are unavailable (tsc exits 127). I did not install dependencies or modify the worktree. Given the focused diff and green live CI, this looks ready to merge once the existing blocking requested-changes review state is cleared.

@pheidon pheidon force-pushed the pheidon/flow-baseline-labels branch from f80c0c8 to 41a9619 Compare May 8, 2026 21:06
@hephaestus-omt hephaestus-omt force-pushed the pheidon/flow-baseline-labels branch from 41a9619 to 6306844 Compare May 9, 2026 02:45
@pheidon pheidon added area:infra Infrastructure, CI, deployment, and operations work. lane:pheidon review:athena risk:medium Moderate implementation or operational risk. state:waiting-checks status:needs-review Needs review before merge or closure. labels May 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:infra Infrastructure, CI, deployment, and operations work. lane:pheidon review:athena risk:medium Moderate implementation or operational risk. state:waiting-checks status:needs-review Needs review before merge or closure.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bootstrap every repo with contributor and PR guidance files

4 participants